Skip to content

Merge from upstream v13 - #56

Merged
vjFaLk merged 192 commits into
ParsimonyGit:parsimony-production-v13from
Alchez:merge-v13
Mar 22, 2022
Merged

Merge from upstream v13#56
vjFaLk merged 192 commits into
ParsimonyGit:parsimony-production-v13from
Alchez:merge-v13

Conversation

@Alchez

@Alchez Alchez commented Mar 21, 2022

Copy link
Copy Markdown

deepeshgarg007 and others added 30 commits February 21, 2022 13:59
(cherry picked from commit 2172ab2)
(cherry picked from commit 07bcbc6)
(cherry picked from commit 973f6b1)
(cherry picked from commit a0bdcbd)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit a4c6cb9)
…during mid payroll dates (backport frappe#29082) (frappe#30099)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Dany Robert <danyrt@wahni.com>
(cherry picked from commit 3a547cb)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.js
(cherry picked from commit d95f893)
…fix/pr-30097

fix(pos): multiple pos round off cases (backport frappe#30097)
…fix/pr-29940

fix: Item discounts for quotation and other docs (backport frappe#29940)
…`Requested Items to Order and Receive` (backport frappe#29987) (frappe#30083)

* fix: Get MRs that are yet to be received but fully ordered in Report

- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)

(cherry picked from commit d3b0ca3)

* refactor: Convert to QB, added test file, removed white space

- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year

(cherry picked from commit e6952cb)

* fix: Sider and Linter

(cherry picked from commit ac42572)

* fix: linter (imports alphabetical)

(cherry picked from commit 54b3676)

Co-authored-by: marination <maricadsouza221197@gmail.com>
…fix/pr-29740

fix: Multiple fixes in Gross Profit report (backport frappe#29740)
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
…0120)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
nextchamp-saqib and others added 27 commits March 15, 2022 13:10
(cherry picked from commit bbe5739)
…fix/pr-30244

fix: incorrect debit credit amount in presentation currency (backport frappe#30244)
…fix/pr-30265

feat: add German translations (backport frappe#30265)
…fix/pr-30269

fix: Do not update ignore pricing rule check implicitly (backport frappe#30269)
…Credit Note (frappe#28607)"

This reverts commit 20216fa.

(cherry picked from commit b781e8b)
(cherry picked from commit b46d6e3)
…te serial return (frappe#30276) (frappe#30278)

(cherry picked from commit 2a0ca7c)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
)

enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.

(cherry picked from commit 76187d1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…30260) (frappe#30288)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
chore: merge version-13-hotfix to version-13-pre-release
(cherry picked from commit cab69fe)
(cherry picked from commit fbcb413)
…-release/pr-30261

fix: Error in bank reconciliation statement (backport frappe#30261)
(cherry picked from commit 4237e5d)
…-release/pr-30266

fix: Validate income/expense account in sales and purchase invoice (backport frappe#30266)
…frappe#30303)

[skip ci]

(cherry picked from commit 5a9bf9f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…-release/pr-30284

fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport frappe#30284)
@Alchez
Alchez requested a review from vjFaLk March 21, 2022 08:59
@ghost

ghost commented Mar 21, 2022

Copy link
Copy Markdown

Bug Fixes

Features

  • Bank Reconciliation for loan documents (93033fb)

Tests

Contributors

deepeshgarg007, mergify[bot], ankush, TurkerTunali, nextchamp-saqib

Commit-Lint commands

You can trigger Commit-Lint actions by commenting on this PR:

  • @Commit-Lint merge patch will merge dependabot PR on "patch" versions (X.X.Y - Y change)
  • @Commit-Lint merge minor will merge dependabot PR on "minor" versions (X.Y.Y - Y change)
  • @Commit-Lint merge major will merge dependabot PR on "major" versions (Y.Y.Y - Y change)
  • @Commit-Lint merge disable will desactivate merge dependabot PR
  • @Commit-Lint review will approve dependabot PR
  • @Commit-Lint stop review will stop approve dependabot PR

@vjFaLk
vjFaLk merged commit 2ef815b into ParsimonyGit:parsimony-production-v13 Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.